Switch to new alternative syntax in tests.
Some cleanups.