fixed a few things, the test passes now