Fix failing test and add some. Nowhere near complete.