diff --git a/lib/spack/spack/cmd/__init__.py b/lib/spack/spack/cmd/__init__.py
index eda8ac8620..6ce6fa0960 100644
--- a/lib/spack/spack/cmd/__init__.py
+++ b/lib/spack/spack/cmd/__init__.py
@@ -88,7 +88,6 @@ def parse_specs(args, **kwargs):
     if isinstance(args, (python_list, tuple)):
         args = " ".join(args)
 
-
     try:
         specs = spack.spec.parse(args)
         for spec in specs:
diff --git a/lib/spack/spack/multimethod.py b/lib/spack/spack/multimethod.py
index a19a06826f..892619c6ac 100644
--- a/lib/spack/spack/multimethod.py
+++ b/lib/spack/spack/multimethod.py
@@ -196,7 +196,6 @@ def install(self, prefix):
 class when(object):
     def __init__(self, spec):
         pkg = get_calling_module_name()
-#        self.spec = spack.spec.Spec(spec)
         self.spec = parse_anonymous_spec(spec, pkg)
 
     def __call__(self, method):
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 2d5962773f..c631a35bf3 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -352,7 +352,6 @@ def __init__(self, spec):
         # Fix up self.url if this package fetches with a URLFetchStrategy.
         # This makes self.url behave sanely.
         if self.spec.versions.concrete:
-
             # TODO: this is a really roundabout way of determining the type
             # TODO: of fetch to do. figure out a more sane fetch strategy/package
             # TODO: init order (right now it's conflated with stage, package, and
@@ -588,7 +587,6 @@ def installed_dependents(self):
     @property
     def prefix(self):
         """Get the prefix into which this package should be installed."""
-#        print self.spec, self.spec.prefix
         return self.spec.prefix
 
 
diff --git a/lib/spack/spack/test/spec_yaml.py b/lib/spack/spack/test/spec_yaml.py
index 79ebeafeb8..869befc02a 100644
--- a/lib/spack/spack/test/spec_yaml.py
+++ b/lib/spack/spack/test/spec_yaml.py
@@ -38,18 +38,18 @@ def check_yaml_round_trip(self, spec):
         self.assertTrue(spec.eq_dag(spec_from_yaml))
 
 
-    def _test_simple_spec(self):
+    def test_simple_spec(self):
         spec = Spec('mpileaks')
         self.check_yaml_round_trip(spec)
 
 
-    def _test_normal_spec(self):
+    def test_normal_spec(self):
         spec = Spec('mpileaks+debug~opt')
         spec.normalize()
         self.check_yaml_round_trip(spec)
 
 
-    def _test_ambiguous_version_spec(self):
+    def test_ambiguous_version_spec(self):
         spec = Spec('mpileaks@1.0:5.0,6.1,7.3+debug~opt')
         spec.normalize()
         self.check_yaml_round_trip(spec)
@@ -61,7 +61,7 @@ def test_concrete_spec(self):
         self.check_yaml_round_trip(spec)
 
 
-    def _test_yaml_subdag(self):
+    def test_yaml_subdag(self):
         spec = Spec('mpileaks^mpich+debug')
         spec.concretize()