Test changes, minor fixes, version read changes