Revert back imports, use nosetests for better discoveries