Added some other tests, rationalized interfaces.