Change tests to be classes, should have own files later