Method naming convention de-engineered. 
Increased timeouts in tests