Without semantic versioning

This is just the tests and local var cleanup