Review feedback; use single main, #ifdef ADD_TEST