Cleanup - Added more tests