Fixed tests, streamlined logger usage