Renaming, and starting some test cases