fix some of the failing test brought about by changing the frontend
Merge branch 'development' of github.com:MakersSpark/Maker-Spark-Server into development