fixed some broken unit tests as a result of the move