Fixed some test issues
Changed setup.py