some test refactoring and a readme update