diff --git a/mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala b/mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala
index 03a775554121da45cab7584237b082ba816829f5..8ea823b30719f17c89229768dd9500a4982d6aac 100644
--- a/mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala
+++ b/mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala
@@ -65,8 +65,7 @@ abstract class GeneralizedLinearModel(val weights: Array[Double], val intercept:
  * GeneralizedLinearAlgorithm abstracts out the training for all GLMs. 
  * This class should be extended with an Optimizer to create a new GLM.
  */
-abstract class GeneralizedLinearAlgorithm[M](implicit
-    methodEv: M <:< GeneralizedLinearModel)
+abstract class GeneralizedLinearAlgorithm[M <: GeneralizedLinearModel]
   extends Logging with Serializable {
 
   val optimizer: Optimizer
@@ -89,10 +88,7 @@ abstract class GeneralizedLinearAlgorithm[M](implicit
     run(input, initialWeights)
   }
 
-  def run(
-      input: RDD[LabeledPoint],
-      initialWeights: Array[Double])
-    : M = {
+  def run(input: RDD[LabeledPoint], initialWeights: Array[Double]) : M = {
 
     // Add a extra variable consisting of all 1.0's for the intercept.
     val data = if (addIntercept) {
diff --git a/mllib/src/test/scala/spark/mllib/classification/JavaLogisticRegressionSuite.java b/mllib/src/test/java/spark/mllib/classification/JavaLogisticRegressionSuite.java
similarity index 100%
rename from mllib/src/test/scala/spark/mllib/classification/JavaLogisticRegressionSuite.java
rename to mllib/src/test/java/spark/mllib/classification/JavaLogisticRegressionSuite.java
diff --git a/mllib/src/test/scala/spark/mllib/classification/JavaSVMSuite.java b/mllib/src/test/java/spark/mllib/classification/JavaSVMSuite.java
similarity index 100%
rename from mllib/src/test/scala/spark/mllib/classification/JavaSVMSuite.java
rename to mllib/src/test/java/spark/mllib/classification/JavaSVMSuite.java
diff --git a/mllib/src/test/scala/spark/mllib/regression/JavaLassoSuite.java b/mllib/src/test/java/spark/mllib/regression/JavaLassoSuite.java
similarity index 100%
rename from mllib/src/test/scala/spark/mllib/regression/JavaLassoSuite.java
rename to mllib/src/test/java/spark/mllib/regression/JavaLassoSuite.java