Modified test structure and implemented basic interface for
adding tests.