Modify tests + gemdeps so that tests will pass