Fixing bugs I introduced with the testing changes