Replaced queries with strong typed queries
Added tests for country reports and national plans