Unit tests working again