moved tests to where it belongs