catroidTest fixes

Fixed two little false failures with catroidTest that I kept getting on my device. See commit messages for descriptions.