Working on two failing tests again

[[selfie-placeholder-0]]