Cleaning up
Adapting test cases and related patterns to the new syntax