Added test
Merge
Changed test timeouts