Fixes a couple tests and hides one from running