Added more restrictions and modified JUnits
Merge remote-tracking branch 'origin/master'