Re-added junit and economy tests
Merged upstream changes