Include more thorough testcases