Refactoring and making new tests to work with zeke project