Modify stubProperty implementation & tests