Added Step cases but still having a lot of failures due to ConstDecl