Added some more "final"s in Test cases