First srs commit
Added some more tests.