Refactor test projects

Refactor test projects