More tests for more complex scenarios (part II)