Changed predicates to restrictions

Added StopRequest possibility to restrictions

Fixed some tests (one still missing)