Add empty jar for testing
Improve tests