Tech Debt: More tests