Fixing some issues with a draft test.