XD-1880 Count integration tests

Last tests to implement before removing test scripts.

These were implemented in the same manner as the Script tests.