adding changes for unit tests