Re: EMC
first u tackle all the tests which come under emc one by one, like
if u r testing RE check the freq where it is crossing the reference level and look in u r board is there any component or its harmonics coming in that range, mostly u have odd harmonics giving the problem.then try to filter out that noise by some snubber in case of power supply or simple rc filter(proper value)
for EFT select the proper input filters like common mode chokes and strong earth/ground which ever is applicable giveng a shortest path to noise.and again u can try for some filter at the signal lines
can message me in detail actually which test u need to pass, i will try to help