Made all non-inherited classes final.
Updated tests