added remaining Testcases and generated general template