Removed SWAP and DUP and a few tester updates
merge