update README
merge conflicts
augment timeout for complex test