Refactorized the tests framework and removed no longer used classes.