tests refactor, readme updates