multiple changes to fix unit tests