Replace base with parent
Add test