General clean up
Removed skip from patch test