Tech Debt: Added some simple test cases