Updated and added tests in infrastructure module.