Match status function, email tracker details

Renamed some functions and added functions to the test