Re-swizzled some scenarios
Merge pull request #1 from phnowicki/pinter

Re-swizzled some scenarios