re-write tests pending