Modified unit tests