Added a few more instrument-tests