Included new tests