fixed a few things, tests passing again