more tests. less closures