remove timeouts + some test refactoring