Add a few more tests, remove self-imposed warnings and NSLogs