Improve quality self test