merged changes from wfrank2509
fixed that unit tests can be run via gradle