fixed formatting and reorganized imports
updated gradle build version
cleaned up tests and moved espresso tests to a separate file