More tests
Merge branch 'master' of http://github.com/tedjk/SKS-2.0
Merge branch 'master' of http://github.com/eirikodal/SKS-2.0
merged med eirik