cleaned up traces, added test pins etc