Added all kinds of tests for thing, added logging