Updating tests for new features