Moved tests into the appropriate test package