Merge "Add tests for user changes." into qt-dev