Fixed tests for versions under 5.4