add in new tests for new functionality