Remove unnecessary whitespace
Add some more domain container tests
Improve query efficiency