2 weeks in samoa

Im planning trip to Samoa in june/july for 2 weeks, for the 1st week we are going to stay on Upolu island and then on savaii for the next week, we are going to be staying at Litia Sini Beach Resort and Tanu Beach Fales. has anyone been to these places before and what can we expect. and also where are the best places to go diving and snorkeling, and is there a Must do thing in Samoa,
thank you

I've been to Tanu, really enjoyed my time there but you have to be prepared for the lack of activity, besides snorkling, sunbathing, ect. It would be good to hire a car so you could see the island as there isn't much around in walking distance. They do offer a day trip tour of the island and that cost around 90tala.
There are two meals a day breakfast at 7/8am and the dinner in the evening 7pm, I think, many brought food from the market to keep them goin or dined at the resturants in the neibouring resorts as there is a long time between meals. There's usually evening entertainment but only on some nights I know Saturday is fiafia night and that involves dancing and singing from the host and family and a chance for guest to join in at the end, but don't expect a party, if i remember correctly most people were in bed by 8pm or whatever time dinner ended. Theres a near by bar about 5 mins away which I visited once or twice but it wasn't very lively, just us and the barman. The resort is very nice but maybe because I was a 20yr solo backpacker I did find it too chilled and found there wasn't much to do.