Tests added, project mavenized