Added some new tests and project changed to maven type