o replaced with _ in bevaoual tests for clarity
o replaced with _ in bevaoual tests for clarity
housekeeping
behavioural tests tidied