Rename test servlet, reformat all w/spaces