Add a test case for #114
Improve test case
Fix #114 bug 1.
Make us not crash if we have a spidified cluster and it has a marker added to it. Fixes #114 bug 2
Update changelog