Added unit test
Longer wait for functional test