Added more unit tests and updated dependencies