removed try catch block from test
Merge branch 'master' into step2