Working

Working version, fixed junit problem.