Work on issues #31 and #22
Robolectric related configuration is commented due to issues.