fixed up version number & factor out some test funcs & xtra test