Moved tests to own modules