Fixed forgotten refactoring issues
Finished regex tests