Fixed failing tests -- sorry gaise :blush:
Merge branch 'development' of github.com:MakersSpark/Maker-Spark-Server into development