Added tests for concepts; minor refactoring
Added more assertions to the retire test case