Fixed failing test classes