Halfway through junit-tests
Merge remote-tracking branch 'origin/masterbranch' into HEAD
Added most of the required tests