Updated test suite
Corrected merge errors