updating towards danvk/master: part 2

until tests folder