Redecorate some tests, too (|amethyst).