Making accuracy test optional