Merge "Re-enabled @Ignored tests." into pi-dev