refactored untitests done as well