Pending tests fixed
Pending tests fixed