Organized test cases and created additionnal ones.