Refactored tests
Replaced old test runners