#118 dependency removed and fixed tests