Okay, I missed a couple of exceptions. Fixed that
#kentprojects-145 work testing 15m