Fixed issue with FutureTask waiting

Improved spec