Finished fleshing out the rest of the methods in the mocha tests