Add integration test. Refactor of inheritance computer.