test-commit

Merging the tests written by Benji into the master branch