Turned hard-coded tests into test cases