Removes some logspam and beefs up a unit test
Stupid merge