Started to refactor unit tests to match design pattern and redefined the instance method for Unit\Type.