Cleaning up test suite
Breaking out utils from test suite