Add new unit tests
deal with merge