Aproved English Language Test for Visa Tier 2

I have recently filled application form for VISA tier 2
However, I have some doubts on one step where I have to prove my Knowledge of English by either


Passing an approved English language test with at least CEFR level B1 in reading, writing, speaking and listening
-- I have already given IELTS General Training examination 8 months back and having CEFR level B2. I'm not sure if that will be accepted for VISA or do I need give separate exam of IELTS Life Skills or IELTS (UKVI)

Another option as per the website is
having an academic qualification that was taught in English and is recognised by UK NARIC as being equivalent to a UK bachelor’s degree, master’s degree or PhD
-- I have done Masters of Computer application and I have got that degree with me and yes that was in English Do I need to still verify that by UK NARIC?

Please suggest?