converted to maven, fixed failing tests, changed junit tests to use
annotations
added missing test file