add merge test and name tweaking