cleaned up helper structure and testing initializers