Added and improved test case variants