Pathetic attempts to make tests work (to no avail)