Minor fixes on the tests

This pull request contains minor fixes for the tests.