Put back date to internal setup, use regex for test