Update tests to resolve smokey failures