minor jsp edit
added tests and resulting improvements