Unit tests and bug fixes for Instrument class

Other minor changes to interfaces