VID-1224 Updated tests to be more complete