Cleaning up, more robust testing, more even partition distribution