The test now waits for a shorter time. Also refactored the test to use stack allocated objects.
Added tests from develop. The test results need to be modified for 2.0.