and a few cleanups in test suite
This will create a new commit in order to revert the existing changes.
