Added definitions resolution (not tested).
Starting to build tests.