Add a few more verification methods. Increase timeout on unit tests.