Resolved issues with logging during tests.
Fixed bad return in parser.
Normalized logging messages