 
 // -----------------------------------------------------------------------------
 
-template<class SerialPort>
+template<class SerialClass>
 class MidiTester
 {
 public:
-    explicit MidiTester(MidiInterface<SerialPort>& inInstance)
+    explicit MidiTester(MidiInterface<SerialClass>& inInstance)
         : mInstance(inInstance)
     {
     }

}

template<class SerialClass>
void setupTester(MidiTester<SerialClass>& inTester)
{
    inTester.registerTest(new midi::TestFixture("Note On", midi::testNoteOn));
}

// -----------------------------------------------------------------------------


BEGIN_MIDI_NAMESPACE

template<class SerialClass>
class TestFixture
{
public:
    typedef const char* String;
    typedef bool (*Functor) (MidiInterface<SerialClass>&);
    
public:
    TestFixture(String inTestName, 
