Migrate more test cases to Vader
More test cases on Vader