TEST: SparkMoWare2, revision to improve ease of using JUNIT and refactoring