(TK-10) Fix test failures

Fix test failures introduced by merging the two tests. Did so by
changing the calls to different versions of the same functions
so they would not have the same output.