Fix system tests. #48