Improvement/integration test performance

Changed integration tests so they only clean the test data directory between tests rather than fully reconstructing it.  This results in a 10x reduction in the time it takes tests to run.