Adding pyshould to testing, adding a few tests and changing the way tests are called
resolving conflicts