added more unit testing