Update Tests
cleaned up issues from CFLint