Work on code review comments

* the test suite fixture is still being worked on
Co-authored-by: justing-bq <[email protected]>

Author: alinaliBQ