New tests cases and structure