Adding code from the testing dojo of October 2 - 2014