Make tests work!

Also fixed ARC4.