add names back to included modules
adds teardown cleanup function