s05-us69: done some tests, still more to go
s05-us69: about half of the tests done
s05-us69: finished the tests
merged s05-us61 into dev