- Method renaming & refactoring
- removes 2 tests that are not applicable for SQLVM scenarios