Added more tests for J&W