fixed infrastructure tests