Added three small classes/Added tests