Move test calls to setup.py
Changed test dir structure and setup file