Correct Features used from dependancy injection, fixing unit tests