fixed tests. production app has a zombie tho
move KWIntercept to ARC code