Fixed up, tests working again.