Fixing up test cases
Merge branch 'master' of github.com:aimtechpartners/skye