Updating mock tests and adding template