Added TestContext and refactored functionality between classeṣ.