More tests
Pass lint