Updated artifactId
Added Edge Cases