Update tests for new functionality