Clean up consistency in test