Fixed tests for 1.8