Making final class normal so the can bemocked in unittests