update tests
clean up regex
Clean up
Update docs