checking with hhvm
changing name on mock class to not create clashes
removing hhvm
Merge branch 'dev'