Fixing failing Unit Tests for these classes.