Add more introduction tests for fake MAC and modified timestamp Closes #627, #669 See merge request !315