Views and tests modification