Cleaned up tests further.