Failing unit tests due to last minute changes