Cleaned up logging and updated test to use more load