Still working on sp. Switched test suites to the new one.