Adding more unit testing