Fixing bugs + adding descriptions to test cases