added more tests; increased timeout