Adding test cases. Not all work.