moved tests to proper place