merge changes
add changes for tests