Wrote the remaining failing tests