Comments
Fix x/y reversal, and relevant tests
Remove debug
Fix test
Fix test