compat mode - unit test updates