Cleaning up test suite and readme messaging