Added five new tests and updated the test suite to reflect this.