Integrated testem, minor tweaks.