OPENUCB 413 and 414: Fix tests

Fix the recurring gremlins that cause the contentitem and linkit tests to fail.