fixes bug 1064608 - CurrentProducts gets called too often

@rhelmer r?

This reduces it in half just in the tests.