Add test to check for mixed conditions
Use custom matchers to generate better error messages
New api for file matchers
Implement new api for file matcher
Use new api of file matchers in aruba api