Added changes to add integration tests measures
Clean last commit (remove unused changes)
Fix some whitespace mistakes
Merge branch '1.2-FRI-IntegrationTests'