Fixing test runners
Adding guards to fileman