Fixing tests. All working. Directives need real tests.