wip: get all unit tests passing