Fixed failing tests due to mustache implementation