Added classes + test objects