Fix layer order in tests