Got unit tests working again