Fixed a bug with variable short form providing, added tests.

Enabled some JUnit 3 tests, removed warnings.