- Fixed failing tests related to changes made towards fixing #35