Kumaran | #936 | Fixing failing tests