Fill some holes in testing