added tests for the no merge option