move tests into packages