Fix memory leaks, fix tests.