Moved tests into individual module folders to promote modular design