Updated tests to work with nose2