Fixed tests for 5.6