sortof forcing application in a few places while fixing unit tests