Update for test features