Internal metadata now in 2.0 format
Make test code prettier