Exactly.  :)
There are a bunch of bad behaving tests I removed to be able to build the fork_ami, they're coming next.