Solving test issues