Vanchi/fix more pending tests

@zenachaturvedi @grosser