removed test classes, testing in main()