Moved tests to their own package