Update tests to use new system instead of old should