Implemented infrastructure tests