Added testing conditions