Updated: tar to new inherit model
Small fixes
Updated: tests