Made project a maven project. Added more tests