Removed old log message
Started fiddling with tests
Switched a bunch of things to camelCase