Reorgainze tests to group object testing.

See #237.