Added infrastructure testing