Fix system tests. #41