Classes Test, Rename & Remove Leftover "main::"