Add more tests
Add shared-parent and fix tests