Added classes necessary to pass tests, tests passed.