added additional tests for profile_page
fixed merge conflicts