Converted to Maven project, added test