refactor tests for asset querys