Change some behavour expectations