Copied over library, modified test, and dependencies