Covered _byMap by a test
Fixed typo
Removed outdated TODOs
Covered _assertElementsPresent by tests