Fixed tests and jsp so we have UI template.