Moved s1 tests to it's own module