Moved infrastructure tests