Increment version, put test dir in the right place