Add extended test with functional dependencies
More tests with functional dependencies