Add new test functionality