update middleware
make tests work in cms suite too