Top module fixes; TestBench IO declarations