I'm going to try to combine these test classes to make things clearer.