Moved tests to a more sensible place