Fixed include and block, inheritance, and tests added