Do bit of cleanup
Add script to test 2d cases