Revert "Fix two unit tests, break one unit test"

This reverts commit 18794fc62afde7a8b641ea28e7310ab111fb4dac.
Fix regex not working