removed skipped unittest, refactoring required to create unittests