Moving version to 2.0.0.M2 and have a working test jar (in progress testing with an external project).