Removed the NotImplementedException from a couple of Test classes.