Cleanup test structure. Add builder, update helper, update module parser.