Added a few clearifying comments
Added value checks for system tests