Small cleanup. Started adding more tests.