Moved test helpers into individual objects