Fix failing tests, and add anothetr WIP test.