Correcting tests and adding more verbose assertions