Re-implementing current test data