Move the one test class into the core. Needs work.