Merge pull request #75 from nickva/fix-oneof-test-timeout

Increase timeout of oneof test from default 5 sec to 15 sec