improved tests cases