Added more classes to the test-program base file