Fix some previously skipped tests