Fixes and new spec to check attribute options validation
Check on code type and removal of the obsolete unit test
CS Fixes