Added view management and tests