hmm in order to get full test coverage, we will need to run all tests with and without the behavioural switch