Test cases fine tuned