Updating unit tests to support Curacao backed Havalo 1.6-SNAPSHOT