user profile model test
fixed merge