Making threeway test more robust, changing order of tests.
Remove patch.
Add use-statement to IDE-support file.
Update license, clean up.