Make classes more testable, add test files and projects