fixed unit tests / regression from rebase fiasco