added better support testing