Removing useless "->andReturnNull()" calls