Stage back

Updated def5 tests and added two functions in Utils