Fix system tests. #108