Changed regex data structure
Fixed bracket error
Started readjusting tests
Fixed forgotten refactoring issues
Finished regex tests