Changes from test