Seperated the tests into different pacakges