Minor formatting clean up
Updated dependencies
Updated tests