Got first scenario to pass again...woot!