move directive to correct module
clean up tests