partial commit refactor unit tests
temp fix