Adding basic tests and coverage