Added and improved Comment related tests. Replaced some old sql with entityManager