improved views and tests