refactored the focus directive
Added new tests
Work in progress still
removed the unit tests for the focus directive