Hopefully fixed the update products story

One of the spec tests failed, possibly due to some logic error(s) in code. Cleaned up the code and hopefully fixed the logic error(s).