more async refactoring
done refactoring original tests with async
remove (async) labels