Clean up some test assertions