Work on new Integration Tests (more comprehensive).