slight change to test, pending views and impl.