Fixed tests for flexibility.