fixed and new tests