Re-added junit and economy tests
Merge branch 'master' of github.com:OscarOrSomething/Foundation