fix unit tests, remove build.xml, change instrument_name