fixes and enable sample to coverage