Refactor tests
Merge branch 'Temp'