converted tests to bdd style with shared utils