Removed final log.
Added more tests.