Cleaned up tests and added high volume test