fixed tests and testrunner, split controller from directive