Remove old test fixtures
Port more tests to new syntax