WIP: refactor: now ALL test cases passing cept query params