Fixed up current tests.