CoverActivity refactor + Test