Added Maven and Tests