added some unit tests
added unit tests