Update and rename JAVATEST to solution