Fixed test suite

Fixed the test suite to work with new regex argument in the and context alias
Merge branch 'master' of github.com:check002/igloo