Some skip/todo fudges and some new tests