Another test, another better design.