Added plotting, updated test