Will's updated TestActivityEntityManager for real this time

Change-Id: I4538fa9b00714e5e8c71d62011e4a5711d6d7d9c