Success and Fail handling
Header fix
Remove function keywordws
test fixes