got a few unit tests working