Merge "Update test 044 for java-8"