More work on Walk unit tests