Working is visible tests, other testing cleanups