Mostly got unit tests working again.