Added test cases, still in the draft form