Moved tests to the right place.