refactor with new componentConstructor function name, minor tweaks, reru...

...n tests