Fixed tests for SS master branch