Far enough for test run; no leaks

Far enough for test run; no leaks