Debugger: Test cosmetics

Use more compact syntax for test restrictions.
Merge some more cases.

Change-Id: I813cc1aa0d06aaac2e1e105f67b6751ebf3d98d8
Reviewed-by: hjk <hjk121@nokiamail.com>