added more unit tests
updated unit tests