Migrate latest implementations into base package
Move tests into test source branch