Intermediary
* Added some tests which found bugs, fixed those
* Adds property updates when labels are added/removed
Merged in changes from SP/JH commit