A bunch of testing and fixes for Tarzan