Updated jUnit tests; added missing context config