adding test and traces