Fixed Unit tests

Fixed Unit tests #703