added new units and tests
added tests
correctet tests