#16: Fixed tests that were failing because of a newly added namespace.