moving tests into packages