More resiliency and tests!