got unit tests passing