Changes for unit tests