update for merge (removed stopManager), and fixes for spec tests