Added some test cases and a new scheme