Rework tests for clarity and better coverage