Additional changes, Rally nosetests failing