Getting tests up to scratch