Removed outdated comment.
Tests: Fixed assertions.
Tests: Cleaned up leftovers.