Renamed classes, added FakeItEasy