Add parentheses support
Don't hardcode testing