Moved some tests into individual methods and temporarily disabled the rest.
Merge branch 'master' into fixtests
Test cases now (mostly) pass
- One test case fails intermittently
- Teardown fails on Windows (whoosh keeps index files open)