refactor with new componentConstructor function name, minor tweaks, rerun tests