Increase coverage

Drying up the code with a Base class containing common methods