- Added Mockito and JUnit
- Switched over to better system to obtain fields
Merge remote-tracking branch 'origin/master'