Test shorthand notion
Fix tests
Apply patches on modules and themes