merge back mods from test changes