Improve good/bad data tests