master: added down test
master: Fixed assertion issues.
master: Applied changes from Twe to T