Fix tests to use correct singular function