Increased timeouts, added usertest