Added tests, removed minor lint