More work to make the tests clearer and use the interface methods only.