improve Firefly Tool tests