remove uneeded datasource template usage
load map assertions were not working, fix them