Added Dillon Caryl's tests