BS-2319 refactor test use @Before