Change version to SNAPSHOT. Reorder variables. Fix tests. #501