Removed unused directive.
Updated tests to workable state.