Fix system tests. #54