remove stubbing templates and update some tests