Fixed minor issues in the testing module