Finished moving tests into packages
Finished moving tests into packages