Assignment 1, two tests still fail at this point