Yogesh/Melanie | 2774 | Fixed failing unit tests