Unit tests

UnitTests fail after IValidatable implements #751