Addressed review comment: Moved `addCleanup`s
Addressed review comment: Hardcoded SQL queries