moved tests to one class per file