Adding test units to make integration tests