FIX: Making tests run better