DrawingSvc unit tests, bug fixes