Updating pom
Adding ds_store
Renaming tests and some cleanup
Renaming tests and other cleanup