Added Terminate and Provision, Added basic tests