Hygiene: Move tests over to core templating mechanism

Change-Id: If16727940dfe39658f0b316f4add670a7e20b799