Modified tests for commit 5145248