added several new tests