Refactored system tests