Makes the toplevel object name more consistent
Adds some testing