Proper cleanup and tests - WIP