Added more functionality to the mock classes -- included extensions of the actual class for testing purposes