Add busted default options
Slightly more readable variable names
Don't use globals unless we really really need to
Dry up the entity tests