Refactor Tests Efforts

Fixes #8