NS and TestFixture changes.