Penny your whistle should get two octaves with ease... if you go higher than that, (even to top D).... it'll sound better if you take the top finger off...

having said that.. some whistles even within brands are better than others.. you may have got a bad whistle... slainte

alison