Tech Debt: A few new tests