Change to java 7
Clean-up test, add recipe