Fixed leak, re-added new constructor
search test cleanup
re-add new constructor for docs