Move up tests from spec