Fixed some bugs
Modified test classes and added the SET_SHOULD_UPDATE command