got all unit tests passing