Fix tests to use new styles