Fix system tests. #15