Check on code type and removal of the obsolete unit test