added unit tests
changed tests