Number layers correctly in tests