Added ProductId to Thng, unit tests