Move directives tests to directives_spec
Update to-do list