Modified unit tests - tested ok