More tests, revert usage of NSLog