Bump version number.
Restructure test imports.