Refactor test classes
refactor UI testing classes