Add infrastructure tests