fixed unit testing
added more unit testing