Refactored tests into correct package