refactored integration tests
refactored system tests