Add count and say, also a lot junit test cases