Broke up tests into modules
Fix manifest