Modified some tests to run without problems with nosetest