Updating to master
Update to master
Move tests to --test