refact tests
refact