updating tests with timeouts, and FooModel to be a better example