Fixed butterfly position when moved, added some tournament tests