add support to pass data from test to new one
remove unused code