fix comment test, nicer WHERE clause logic