Update test location, setup.py and
 README