Fix some outstanding tests
some additional tests