working on making tests pass