Added longer timeout

Added longer timeout and added transitions.