Address PR comment's

Fix tests