Fix tests to be more behavioural. Fix fallback problem in the process