add base template back, add expression parser test assertions, fix some module manager issues