Made stop() private
Finished test coverage
Merge remote-tracking branch 'origin/develop'