Started writing tests #59