Refactored behavioural tests.