Setup basic address search and advanced address search test templates.   Wrapper cleanup too.