Updated s6 tests