Improved behavioural tests.