Reflect fixups and tests