In order to build the dev branch, we had to comment out some tests which fail due to refactoring. We need to fix those tests before we can merge to master