Test files
Tidy up of code. Some Refactoring. Added IInstrument interface.