UnitTests: Updates class names and method signatures