Updating base classes and adding WinAPITest