removed build dir
prepared for tests
merged from master
removed instrument tests