moving tests to core