Adjust unit tests for 1.4.0-SNAPSHOT