Added base skeleton for tests and coverage