Adding unit tests for user feedback
Fixed a couple of bugs to do with objects not being synchronized and missing !s in front of conditions
Merge remote-tracking branch 'origin/development' into development