(#9) Fix a couple of lint issues and a failing test.