Cleanup broken tests which are not conforming new APIs - need new tests next.