json test added
merge ; cache test added
tests updated