Added some test cases and renamed some