Cleaned up is_test testing slightly.