Re-added junit and economy tests