fixed lint & new tests