Added classes that allowed scenario 2 to work