converted into scenario tests
converted more scenario tests