Tech Debt: Additional tests and error checking