Minor testing library fixes