Fixed Bugs and Assertions in Test Classes - part 2