Test API cleanup and trying to stop tests somtimes failing