moved classes from test project