Started to work on fixing tests; added gradle