Making a few more tests pass :sweat::sweat: