* Simplified assertions for testing
* Corrected descriptions
* MInor fixes