Test, designs, refactors