Simple re-org + few new basic tests (timeout, generate, from delegate)