Some tests!
Remove log statements, clean up test cases.