Algorithm that was implemented had some bugs, and did not
catch all special cases.

Added more components to subtest for this method. Seems to be working
now...