Reduced logging, edited test cases.