Added some test cases for JD to play with