Updated dependencies and added more complex tests