Move imports in tests to top of file
Update README
Move tests back into their own package
Add runtests script
Add __init__.py to tests package
Merge branch 'develop'