Combined test program into main project, test program is broken by latest changes