refining details/tests