Refactor testing, list of tests, test test