Should these tests be disabled based on a settings flag instead?