Fixed issues with Tests and re-instated them.