fixed multiple broken tests due to simple statement wrapper