Make namespace optional, and update tests