Add more specs to test script
Merge branch 'master' into profile_pages