fixing unit tests
fixing unit tests
merged test refactor
updated tests