ISPN-2619 Avoid empty checks in test using method specific keys