add changes for unit tests