All tests passing and last two tests implemented