Switching tests over to new way.