Moved tests to appropriate modules