Updated version.
Cleaned up pom, renamed tests