Added more unit testing