More tests, added sloc