Even more fixes to test code... MORE safety nets :)