More testing with additional functionality