Fixed tests placement.
Removed bad dependency.
Improved base fields definition.