Modified tests to work with unittest2 discovery