Added constraint to query to not include the test accounts fixes #3641