Final mods to support tests passing