added tests
added stop method to fix tests