#36 Improve System Integration Test

Various imporvements to readability