Added re-declare tests, and updated tests for namespacing correctly