stopped using an empty suffix for test/branch stuff, so that things are less confusing down the road when versions change