Adding test suite
fixing merge