Add some tests
Add SlowTrap
Tweak some tests
Add some tests