Added first classes & tests