idiomatic changes to tests
idiomatic refactors
remove more code\!
Remove keep files
move to idiomatic non-locals view rendering