WYJC: tweaking valid tests cases so they all pass.
WYJC: tidied up all Java tests now.