added property and condition in handlers

changed brocken test

removed redundancy

removed exception raise from model method

test expanded

fixed error message

successfully rebased

Change-Id: Iea5deca7c05bd5d6ea71592c5b019c9d84e8d9b8