PJSM-210: Fix tests by using singleton vs singletonList