Version extension fixes and tests