cleanup, get unit tests working