Testfixes
Added shutdown with timeout, used minimal timeout for shutdown