New and improved tests cases