fixed tests and removing some logging