cleaning up namespace, updated tests, removed ds file