Clean up test cases code, update readmes