Adding Maven, simplifying inputs, fixed tests