Cleanup of unit tests (comments)